Cyclogram refactor