Refactoring power ups and removing all build warnings.