Tidy up a bit acc. to PEP8