Refactor status output of gateway and storage