Fix pep8
Improve setup