Improved messageHandler readability and fixed silly type error