[#628] More PEP8 fixes