Console refactor.