Added temp file placement and whitespace trailers