did some cleaning up

ToDo:
- security issues
- models
- CLI