Change email address and fix whitespace