OAK-1263 another round of formatting