Make PO box field optional and format code properly