Some more style polishing of vmodtool