Some refactoring
Some refactoring


Former-commit-id: 2780df45782ed172f1f56b58a02457ff585104e1 [formerly b6a6f3df4b4eb14a1224c862b7430251999f5d3e]
Former-commit-id: 0d9bbb21ec6d4c1e1480236e7b5c7ccca5e4492a
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine