Code cleanup
Refactor form_builder