Slight reorganization
Small change