got rid of typedefs