Minor refactors to clean up code
Better formatted printout statements