Add missing annotations
Add missing newline after namespace
self:: to access local statics