i3: move some comments