use replace instead of replaceAll, cleanup