removed double typedef