removes comments for implemented TODOs, PEP8 fixes