general syntax cleanup