Fix #665 InaSAFE Process fails on Earthquake Scenario (Building) and changed codes to follow coding convention