Refactor. Minor changes.