Minor formatting fixes
Use standard VM type