Implemented review comments
Implemented review comments


Former-commit-id: 0bc718b2ed96772018d78ea5bf6f46a81e111c3f [formerly 2573746e2378085a130546b225b68784083f4304]
Former-commit-id: edc4d67e59ac75e43d2d0b8b76b5aa7fea84f876
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine