some cleanup and now with verbose / non verbose output