Use Text instead of ByteString, clean codes