BATCH-2223: Fixed formatting