Reindents, minor aesthetics
Refactors Regexes