more changes for style
Merge branch 'master' of https://github.com/Fathalian/Cartman