PEP8 code cleanup, removed dead code