Make minor design improvements

Close #112.