Refactor cont