Logically restructure MessageHandler