form code cleaned