Adress Eric's comments in PR