Seperated powerup classes, and tidied code