Refactor options order in form_builder methods
Code cleanup

indentation, spacing, and 80 character max width for readability