Removed unused class (MessageBuilder)
Added few comments
Reindented code