Changes done according to comments received after the merge request.