3.0 - Cleanup

Just some minor code and docblock cleanup
The issue here is that the pattern can be `null`. Changing the default may have unintended effects.