Refactor all annotations

* Work with new flat data.
* Adapt code style according to guidelines.
* Refactor code to use return-early when possible.
* Update tests to reflect the now working again post processing.