More refactoring in game and sprites