Minor reorganization for clarity