Headings renamed and code clean