cleanup and comments in rpl