fix inaccurate comments, remove commented out code, fix final PEP8 warning