(*) Typo fix, refactor.