Refactor the rst