Add location for article, some improve code