Move comments into right context