extracted more strings to xml values and moved variables to locals.