Restructuring for clarity