This is cosmetic change so it should not be included in this commit