code cleanup
code cleanup

tjd08a/open-catalog-generator,ericwhyne/open-catalog-generator,tjd08a/open-catalog-generator,ericwhyne/open-catalog-generator,snordt/open-catalog-generator,snordt/open-catalog-generator,tjd08a/open-catalog-generator,tjd08a/open-catalog-generator,ericwhyne/open-catalog-generator,ericwhyne/open-catalog-generator,snordt/open-catalog-generator,snordt/open-catalog-generator