More dirty whitespace cleanup
Some code cleanup in vnic custom matcher
Moved vnic custom mathcher checks around a bit to improve readability