whitespace and fix global leak