keystore cleanup
refactor
refactoring
cover traffic init
cover traffic