Refactored salts out.

Fingers crossed.