some minor reorganization