#87525R: refactoring and minor changes