Mujir | #457 | some refactoring