Internal plugins PEP8 cleanup