Further changes to style
Merge branch 'master' of https://github.com/jdl39/HappinessTracker