Removed the typedefs - per the coding standards