Refactor Cyan