Updated encoding and removed trailing spaces