Small refactoring
Small refactoring


Former-commit-id: f1341760727f7179b3f53697e8f21c73794f9dd9 [formerly f1341760727f7179b3f53697e8f21c73794f9dd9 [formerly 89657decf9cebba835e3bebe0450a6eef65cae56]]
Former-commit-id: 9ea42a4516bcb8ce4e48a63abfd91635e8bc983c
Former-commit-id: 8ea4399296f14185ac19de6bebe329add7f47009
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine