Little bit refactor.