Form handler methods refactored in prep for future release features