Address Aaron's code review items #53