Clean-up of how we do spritesheets