Revert "pep8 spacing"

This reverts commit 2db111899d2b679aa5f534ed1418d273f3dc19e7.
pep8 spacing and imports