enemy refactor/cleanup