restructuring for clarity