Cleaned up some code
Merge branch 'master' of github.com:toshle/sportinator3000