Tidy code, add SpriteSheet