Cleaned up some stuffs
Merge branch 'master' of github.com:tnagorra/potato