Improve output and extras
Refactor