Integrate review comments from Matei
Integrate review comments from Matei