fixed untracked files
some pep8 cleanup