cleanup and new pretty print -l