Clean up RainbowDash a little