Simplifications, restructuring