Some refactoring
Some refactoring

gem/oq-engine,raoanirudh/oq-risklib,g-weatherill/oq-risklib,g-weatherill/oq-risklib,g-weatherill/oq-risklib,gem/oq-engine,raoanirudh/oq-risklib,gem/oq-engine,gem/oq-engine,gem/oq-engine