[COREVM-70] Code cleanup
Merge pull request #10 from yanzhengli/COREVM-70_code_cleanup

[COREVM-70] Code cleanup