Finished code review items for #53