refactoring: code cleanup and improvement (moved a function to a different location in the module).
refactoring: code cleanup and improvement (moved a function to a different location in the module).

Justin-W/clifunland,Justin-W/clifunland