Cleaned up code, resolved an issue with 0x200B