Code smell cleanup
Move to NOWDOCs for template defaults
Code smell cleanup