refactor & new enemy class