Started to move heart of KDF code to private method for KeyGenUtils