Updates from Code Review