some code formatting
pep8 fixes
rearrange
gitignore