Renamed and moved methods
Cleaning up comments and variables
Testing formatting while beefing up steps