Attempted merge of formatting updates