Better output formatting
code review, avoid code duplication
Managed another undefined value