More PEP8 line length fixes,

Created variables to hold validity lines