Removed that awful typedef