Updated to use the proper salt Pillar incantation. Also factored out some repetative Pillar calls.