cleaned up code
Merge branch 'master' of https://github.com/srli/wall-e