Cleaned up character class a little.