pep8 and minor details.