Small adjustments and reorganization