WL-2267 Working towards code review changes
WL-2269 No need to redefine variables with <c:set />