vb cleanup
refactoring