Added the article references
Refactored a bit