Unnecesary comments cleaned