Formatting tweaks for PEP8 compliance