Reorganization for better utility.