Starting to clean up some code and naming conventions.