Remove use of typedef()