Minor adjustments and reorganization