Refactor Sprite class a bit