Updated gen salt formula with a couple of clean ups