Clean up whitespace in Env