Some minor code changes
Merge pull request #27 from edelbluth/docbuilder_optimization

Some minor code changes