extracted strings, minor refactoring