Code refactoring, some enemy fixes