Adding a verbose mode. And Refactoring #2