More refactoring
More refactoring


Former-commit-id: 3f2fe208d59d1a92006b2ac98008e6bccd4a4c0d [formerly 16df6829aaeda0356763b5b61d6cd05f7ac6eaa4] [formerly 16df6829aaeda0356763b5b61d6cd05f7ac6eaa4 [formerly be0a5b289ca41f08d6ff088691c436a086fa7505]]
Former-commit-id: 50a7908a97ffcd9a85746b956a97228916766688
Former-commit-id: 8ce8c35ccc0be2d43de755f300277b5837664dc4
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine