Added name, cleanup