Improve PEP8 compliance etc