Changed some code to more pep8 standard.