Better log messages
Refactor game logic