PEP8 fix and change line flow