Refactor UrlBuilder
Refactor FormBuilderHelper