Add storage type annotations to comments and storage type (annotations) to inline javascript
Rename static variable to class access and add real static variables