Moved variables into the downer scope to avoid misleading.