Cleaning up form object validation