readability improvements to form generation