escape! and clean up some whitespace