a bit of refactoring of names