Small readability change
Small fixes
Merge branch 'master' of https://github.com/barbatus/GimmeRide