Beautified code by removing blank lines and creating meaningful names.
Authored by: gandehao 2018-02-07
Parent: [r2431]
Child: [r2433]