More refactoring
More refactoring


Former-commit-id: 2d00c3d1b9533b9c9db47be9cb9fb35837fa51f3 [formerly 2d00c3d1b9533b9c9db47be9cb9fb35837fa51f3 [formerly 9429f09925f03e70df75ee9cf9385df1ee293027]]
Former-commit-id: 65dea997551608cf6691ac57544c2f4b1ba7ebc8
Former-commit-id: 337646a0c04c34d9a3ae77d1012edabd890c4bf9
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine