Un-typedefed and removed the init and empty functions