- Simplify redundant regex
-Remove forward slash
-More regex cleanup