adding validations and cleaning up forms