fix code review issues
fix code review issues

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