ViSH Viewer refactoring