Apply Cale's code review comments