Some small reorganization