Annotation fixes and basic formatting

2 jobs for !270 with somersj-master-patch-77039 in 4 minutes and 55 seconds (queued for 1 second)
latest detached
Status Job ID Name Coverage
  Convert
passed #229873
convert

00:04:44

 
  Deploy
passed #229874
commit

00:00:10