another syntax cleanup