Pretty output
remove unused code
make it better