Refactoring some child/parent cues