cleaned up code
cleaned up code


Former-commit-id: 9f75850fafcd02642e815621536e8ae671c94cd7 [formerly a8d7544b46a40fdc64a4fa1f8a7f26b86cd0c1c1]
Former-commit-id: 71a2ffee44ee0d3ca354ae8084068c4967ed6220
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine