cleaned up ugly row[x] code

replaced with pretty variables.  Much less terrible now