Cleanup annotations
Bugfixing