pep8'd and better doc