Move variable out of global space