Code cleanup
Merge pull request #2010 from Randy-Ma/code_cleanup

Code cleanup