Refactoring once more.