PEP-8 and other tidying.