Code cleanup - Settings values
    - separate PA specific Strings

Change-Id: I5562fff4e39ab50b4065bd81b87c3e339778b0d7