Cleaner powerup code