Refactor UpdateGasCloud away (#64)