Code cleaning

- use constants where needed for the tag/key
- remove wrong tag

Change-Id: I32578ce6a3a604dc0ea7168206a5d84391e2cce7
1 file changed