Brought up to pep8 standards.