RR - code clean up.