Part of refactoring with marker coloring