Sprites refactor