removed unnecessary use of holders; cleanup, whitespace, formatting
Merge pull request #1 from burtbeckwith/master

removed unnecessary use of holders; cleanup, whitespace, formatting