Finalized some comments