clean up block syntax