Some code cleanup in FormViewController