Do what code reviewers suggested