Merging Patrick's formatting updates