replace typedef with using