- code cleanup
- add link manager