minor Core() reorganization