Fixing code review comments