Remove psutil dependency and some pep8 fixes