Comment changes and refactor.