issue-14: Updates based on @anton review