Clean up regex a bit & comment + unit tests...