rename value, remove loop