Incorporate code review changes
- sanitize code
- remove dependencies