[skip ci]
optimized var names and element selection
[skip ci]
optimized var names and element selection