added content, cleaning code