refactored comments + adding table deletion