Improve output
Refactor & clean up