Some syntax improvement