Refactor gox usage