CS fixes
Annotate class properties