another minor reorganization