More Refactoring and Enemy Fixed