Form validation: Minor code cleanup