refactoring; template doesn't include spacing, added by exporter
use yoiang CCTemplate repo while waiting for fix