changes from codereview