consistently use cfg