WIP: code review changes