Implemented review comments
Implemented review comments


Former-commit-id: 285d5863acf3b9cb15b70c659087df2a1be7cbff [formerly 02beb1c3ea0f7a7da457e1487691a111220f02b5]
Former-commit-id: 619fa2b81a10f1cf4a70d01e762d07106e05fdc1
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine