Cleanup and formatting

Cleaning up some print statements and comments