adjusted article selectors
cleaned up code a little