More refactoring
More refactoring


Former-commit-id: 28b5d13800397574c3d5ce8b12df3d541d7aece0 [formerly 28b5d13800397574c3d5ce8b12df3d541d7aece0 [formerly 7c8b8396a37cd704316cd6676c378a828f9c12d7]]
Former-commit-id: 89e55ae2113fdb9a4ca58be8c6f8e08bde9b0e43
Former-commit-id: 98d4ff6d1be2bb1ddb070d85ae4f4ff7a079bc12
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine