Changes from Code Review