refactor game prototype code
Merge branch 'master'