a bit of PEP8 and plugin fixes