cleaned up some code and added a delete