Renamed a variable and moved small stuff around