Refactor of GoalPoseMarker