dataColumn color matches its data type

Also some indentation