Changed to conform pep8, fixed #821