Improve helpers and delete others helper