Fix brokenness caused by stuff
Stop using var