Code Review updates