refactor makeFields() to remove repetition and make field wrapping explicit