Issue #5: A little code clean-up in the VAST