minor clean-ups
minor clean-ups


Former-commit-id: 54654cb13671acbc0d86d40afe7396ed473cdcce [formerly 54654cb13671acbc0d86d40afe7396ed473cdcce [formerly 580215c494235d46d02ab25c3da81e38c864a0be]]
Former-commit-id: 560888dedc02714faa8b8181c69d37431593ab61
Former-commit-id: 5aebafdd8433a5a3b40504b23c5aca22ef3a34f2
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine