Refactor RWD Marker.