refactor(interimElementService): more code tweaks