Added (incomplete) enemy, cleaned up code some