Minor code cleanup... pull repeat use vals into constants