PEP8 + Clean

Your file was hard to read. It has been pep8'ed now.