#5272: Refactoring code