[Blogique] refactoring