cleaned up code; added Deleter class to handle deletions, needs to be fleshed out