Form Validation - work on restructuring.