Moved variables around