Remove comments from tnutz's merge and make his additions adhere to PEP8 (please do this yourself the next time around)