cleanup and work on enemy class