removed Regex replace method call in favor of string concatenation
minor changes in collection builing order