add style, fix annotations