Added trailing ws trim, etc.