bit of stylecop
more MainVM tidy