Marking next refactor