making keystore better