minor refactoring with names