Implemented review comments
Implemented review comments


Former-commit-id: de32b89955e81b495e166a66252bae925ea8cec3 [formerly 6186af799fe066a0aa1e576917a0a5dc004599eb] [formerly 6186af799fe066a0aa1e576917a0a5dc004599eb [formerly a85e0a506699844b80a5996143fa354584934809]]
Former-commit-id: 6a478137862e2e9a0862d4204b4a7c3e0a1f2e25
Former-commit-id: a7d81ab5bd651aaa1199e8c4f67781507c8fb3b5
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine