Some refactoring on SEO artifacts