Moved some comments