Little bit of refactor.