Add content state & refine the cleaning method