Following up on code review
Following up on code review

jfederico/Hilary,Coenego/Hilary,nicolaasmatthijs/Hilary,timdegroote/Hilary,mrvisser/Hilary,stuartf/Hilary,Orodan/Hilary,simong/Hilary,ExC0d3/Hilary,timdegroote/Hilary,nicolaasmatthijs/Hilary,stuartf/Hilary,jfederico/Hilary,simong/Hilary,Orodan/Hilary,mrvisser/Hilary,ExC0d3/Hilary