Cleaned up Enemy code