CORE-5874: some minor corrections and reformatting