refactor, improve terminology