Tidying a bit based on PEP8 style guidelines.