minor source code clean up, no logic changed.