Keep salt creating/en-/decoding in make_key method; some commenting improvment