Remove placeholder
Refactor to Game class
Code cleanup