Added stripping of quotes from token