Removed unnecessary comments, added some comments