Mujir/Neha | #1771 | small refactoring