More article refactoring