Minor code review for #88
Minor code review for #99