Refactoring code and WIP on article.