issue-9: Minor code adjustments