Clean up the Sprite class a bit.