Cleanup config parsing call
Merge branch 'v2' of github.com:anchor/vaultaire into v2
Run code formatter