Added comments and proper delete functionality.