Minor refactor to Sprite