CON-2249 & CON-2252

these variables won't change so there is no need to declare them each time this function is called