syntax cleanup