cleaned typedefs