Improve style and conciseness (part 23)
Fix PEP8 mistakes made in the process of improving things