Tweaks to the package form for different form styles
Template and string tidy ups