Code clean up.  Also made it so that the order param from the form is optional