refactoring and cosmetic change