Reviewed code and adjusted comments