Code REview

Hi Anthony,

This is pull request from Christian and Suyash.

Thanks.