Code syntax cleanup