adding and cleaning up the content