awoods - code review updates