user story #1447 - Refactoring salt

Change-Id: I5e07a5db7391fea79284280efec3a3cd9f23d4a3