Pushing Return Values of Interface Methods
Pushing Arguments In, Removing Redundancy
Updating Constants, Finding the Loose Ends
Refactored