Cleaned Up the Code

-Refactored some objects to more appropriate names
-Cleaned up some unnecessary code