Simplifying powerup code