pep8 tweaks and better organization