Minor adjustments and clean up to the RSA module