Refactor, improve method names.