some syntax cleanup