Move var, let to blocks
Add -> to operators