RSA class minor changes