Move some comments