Simplify vps if checks

Resolves #60

Please test..