Remove old code
Improve output readability