An improved mathematical formulation for the carbon capture and storage (CCS) problem