Remove duplicate code in Article