A few regex changes and stylistic changes
Cleaned up the code once more. Added one more line of logging
Teeny tiny change to wording