Some refactoring
Some refactoring


Former-commit-id: 0507b58cad42c7abf972e9d9bd3e3f5bb298c057 [formerly e3b82e39dd18253e29fe5251289caba999282b47] [formerly e3b82e39dd18253e29fe5251289caba999282b47 [formerly 0ef43196a9efd590c4fd2e19b95901004bb53b01]]
Former-commit-id: cb77ae5b4be549a2fbae6c60ebb7415fc9a23029
Former-commit-id: 37c3c0263a435973ab0312c079dd733c26c5a8c5
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine