Stash: load in correct language and minor refactoring

Change-Id: Ifd9e6c757edaae8613ae4be23d07bd3cc9995008