Some syntax cleanup