Some refactoring
Some refactoring


Former-commit-id: 726625c6abefb4256a52b74cd53a9bdd462e7199 [formerly 40fa248f404a2e57373015becdbd90cd9919e42f] [formerly 40fa248f404a2e57373015becdbd90cd9919e42f [formerly ec0ebce4eb31142b35b5bf3a0b4e7fb7e4d5bd24]]
Former-commit-id: 80780cf4c723c7f223866bad778f512f7b441253
Former-commit-id: 8ee912e675c80ea5102b13c99d40093dcfe28ddb
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine