More refactoring
More refactoring


Former-commit-id: 340d28c64876a898499db3df44220e9d4ca61f4d [formerly 046981121184899f9adc9995d6d5e443dd6eab87]
Former-commit-id: 9d8b0de2071cef4db9915bfa827ac70d01e23cb9
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine