Simplifying code

Depends on https://github.com/cloudescape/govmx/pull/14