Cleanup
Add flag for verbose option