Various formatting tweaks to conciliate PEP8.