Improved code readibility and comment clarity. No functional changes.