More reSt cleanup