Refactoring
Regex hardening
Fixing rm
Merge pull request #1 from jrusnack/master

Minor fixes