- fix spacing for decl
- add type/trait/class