style fixes and annotation count