Refactor changes to Form