DOC: Cleanup comments and some print statements