cleaning and commenting
Fixed Merge changes
Merge branch 'master' of http://github.com/noahpc/WhiteCollar