Removed dead code, reordered methods
Remove "message of the day" because it is nonsense
Add unit test