minor refactoring
minor refactoring


Former-commit-id: b8debc171bd0d75a9e232ca060b6381a5320638a [formerly b8debc171bd0d75a9e232ca060b6381a5320638a [formerly 7c2b3220cb12aa414d6bfd91fd5b4f985c8ea471]]
Former-commit-id: 2cbcb586a7c3d0a21d72d7ee678b638aeeb5adf2
Former-commit-id: 2e5bebebc09b812b894f1f1ed13896620bde9f6e
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine