Cale's code review comments