Refactors and fixes enemy movement/attack