- Added missing dependecies
- Removed unused dependecies

- added comments, formatting