move primary mailing address check to its won line