Changes based on Code Review