Refactor markings