REF: Formatting updates