:lipstick: key clean-up, changes in fields allocation

Change-Id: Ifd314b9fcc79c19a54e4dbeb98ddf23aa7ea74d1