More refactoring
More refactoring


Former-commit-id: 2d9b379a7d6e40a53196a95e3d402db3da025123 [formerly 2d9b379a7d6e40a53196a95e3d402db3da025123 [formerly 3d6fc661bbc101de80886e221d862b790c104efe]]
Former-commit-id: b4cc1dd61513bfa3c2fa23e75fdb00e407533a8a
Former-commit-id: 980b1ca174028c4d95bbe672c813e4fb956d5837
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine