Added additional invalid strings
Cleaned up code to remove invalid strings