and fix the pep257 formatting and +1 for merge