fix messages, clean & refactor code
Update year
fix from sjinks & clean
Merge pull request #157 from xboston/master

fix messages, clean & refactor code