tidy of code on main order form