Do syntax cleanup