PEP8 fixes and remove commented code