Better output formatting
Prepare for verbose mode