Better dependency injection
Correcting injection name
Introducing Keystore abstraction and Formatter abstraction