[CLEANUP] code cleanup, is pep 8 conformant now