Refactor, improve names.