clean up whitespace and such