Changes based on Code Review feedback