Refactoring names, more verbose output