Some cleanup and renamed keystore to truststore