Refactor form_builder further