PEP-jonathan fix and also removed uncommented stuff from before.