#4580: Refactoring ended. (minor code improves)