[COREVM-84] Code cleanup

Mostly cosmetic changes.