Clean up form styles, helper naming pattern