Refactorings of
* State
* Annotation
* Renderer