Some refactoring
Some refactoring


Former-commit-id: 1f2429a24d1bca9bb57ebe7ee80b665d5b2ed132 [formerly e6b3eb9ae73a4d06b264615d2d0d5e2f15dd0a46]
Former-commit-id: 693256fa3f509afe71617f340cff3ca4e9164d2b
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine