Updated some comments, code clarity