awoods code review updates