Clean up code style wise
Merge branch 'master' of https://github.com/mdenchev/Tetris