more manual E501 fixes