refactors naming
refactors deleting