Some refactoring to make the game more...good :)