clean + for calling from outside properly