Updated docstrings
Refactored some annotation management (avoiding bare annotation handling)