Refactor vcl