minor refactor of form content creation