removed cleanup from name organizing