Changed var names a bit