Style and PEP8 fixes.