Reformat code. Simplify annotation setup. See #603 Original pull request: #604.
Closes #603 Original pull request: #604.