Strings and stuff cleanup/beautify
Strings and stuff cleanup/beautify part 2