refactor; improve naming