Added verification for number fields & streamlined code