Vishal #0 minor refactors