reorganize styles
more intuitive annotations