pep8 changes
some refactoring, checks, new options