removed extra typedef