comply more closely with codepro audits cgmcandrews
Merge pull request #208 from zoccihedron/audit-model

comply more closely with codepro audits cgmcandrews