fix: message count increment and clean up redundant else

fix: message count increment and clean up redundant else #203