Make keystore.h bit compact