Reorganization for performance