Vishal #0 minor refactor