[COREVM-84] Code cleanup (Closes #22)