Brought code up to pep8 standard