Address review in #58