Small edits
Small cleanup of VM class