Some code clean-up
Some code clean-up

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