code clean+changing the content-fix