Some minor function name changing and work on the article.