code cleanup & refactoring in MessageSend class