Cleaned up how Clues populate themselves