Refactor in progress.