refactoring some powerup stuff part 1