Chnges from Code Review