Following up on code review
Following up on code review

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