Changed locations of variable declerations