Minor changes (special chars fixed, unnecessary comments removed)