clean up and better looking output