Light restructuring for clarity