Performed slight restructuring