Issue #137 - review feedback + cleanup of VB project