[#1358] The joys of PEP8