Addresses review suggestions
Addresses review suggestions


Former-commit-id: a60518e837493801b88b609fd0f43e5a95b50f38 [formerly a60518e837493801b88b609fd0f43e5a95b50f38 [formerly 134419ad11cc217acd8a54fb4487639cd818b54e]]
Former-commit-id: b694bfc18d1cf224642730e6895f9591e457636d
Former-commit-id: ce14fa02bc52312369d328026ce64a981fda65c3
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine