pushing lots of fixex! everything is pep8ified!