Updated names of methods to more accurately reflect what they do
Began refactoring