Reorganized LightCycle code