Extracted more constants, added print functions to MessageSender