address @kthyng's review comments
address @pelson's comments