Removed unnecessary function which was left after string key->keyword conversion. Changed some confusing parameter names.