PEP8 review

Master -> merge
v1-train -> not tested