Code tidy up. (mess detector)
Re-added the salt. We shouldn't need this but I can't get it to trigger otherwise.