Fix scaffolding wrt PEP8