vast client refactoring