Fixed changes per Goldman's code review