Cleaned up code in GameManager

-Removed commented out code
-Put things in separate functions
-Removed if checks that wasn't needed
-Deleted empty lines