Set marks. Global refactor.