Verbose log output, refactoring