Better deletion and better unit testing
Documentation