One last cleanup before I try out other form helpers