Clean code and add Game class
Merge