Update code to reflect comment on #112