More DRY improvements (VCA Complete)

Updating comments throughout to indicate what has been improved and what
still needs work.