Bit of refactoring done, work on it more with
unicode