Refactor Clef into a POCO