More refactoring
More refactoring


Former-commit-id: e77974161c23fc89043862bece23fba280b4f097 [formerly e77974161c23fc89043862bece23fba280b4f097 [formerly bae0553788b1b52addb6759170de375c46c8f0e4]]
Former-commit-id: bcc7ec1ae7e060a11e559d00feb37297a46f890b
Former-commit-id: 68c85d575b6b981abc79e72d4391deb0a29c3ad3
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine