Mujir, Bharti | #457 | refactored code