Cleaned up code
Merge branch 'master' of https://github.com/pcas00/productivity