Update name and KILL TRAILING WHITESPACE