Refactor Article