More cleanup on article var