Blogique: refactoring