Some refactoring
Some refactoring


Former-commit-id: c65fd559658986d4d6d568e91b70f38c0030a725 [formerly bc4ee5639b116e3a1ce0e48bbb0e602f5037d2bc]
Former-commit-id: b05d1affc41a6622a88065ecc70e615b016cdaab
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine