Add verbose flag and make silent by default
Cleanup