Refactor cont.