minor refactoring with string constants