pep8/coding styles fixes