Fixing string literals + cleanup