Some variables made back local