OC syntax cleanup