Cleanup of Powerup

Cleaned some of the powerup code.