Refactor cues into classes, for easier modification