cleaning up some of the output formatting as well as renaming some methods to better reflect what they do