Adding handling for VM question

Additional indent fixes.