Some refactoring
Some refactoring


Former-commit-id: cdd86e824cc658658ef2a775651cbf0e62063823 [formerly 44493420a7662eb8c6371770d51b3967c6cc7e30] [formerly 44493420a7662eb8c6371770d51b3967c6cc7e30 [formerly 6ff333db7699fb53a9db5b636feac1a0c563cd48]]
Former-commit-id: c7dbcd65b6be1ffbaed7287fdab99f6d46e95b82
Former-commit-id: 1d143f59aea3486f167d145622a0715578e24458
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine