removed replaceAll method calls