Mujir | small refactoring of retrospective entry. pushed code to domain.