Refactored  form