Lots of updates and reformatting according to pep8