Game complete. Removed a class and simplified code