little restructure and added rfc-conform escape chars