Some refactoring to Spritesheet.