A few annotation updates

The first commit writes the annotations on methods.

The second adds a new line after annotations on class definitions and methods.