Apply feedback from anonymous reviewers :)