code modernization
Merge pull request #1 from plone/jensens-cleanup

code modernization