[COREVM-60] Code cleanup
Merge pull request #2 from yanzhengli/COREVM-60_code_cleanup

[COREVM-60] Code cleanup