change to rst and cleanup