Some refactor and add articles