Cleanup for coding conventions and clarity

The template variable seems to be unused, and is removed.

Change-Id: I2a1e0070448bb2021b442a831cd162783e419e0a
Cleanup whitespace and comments in .listen for the translation module

Change-Id: Ic4af14155a126d835a97f802b712b7bad8ab4a19
Merge "Cleanup for coding conventions and clarity"
Merge "Cleanup whitespace and comments in .listen for the translation module"