Code cleanup (pep8 / import orders / code format)