Fixed bug with reading wstrings
Reformatted some code