Fix a few code style problems in cougar-model-builder