A couple style changes and fix missing import in consumer template.