Merge "Refactor the rst"