Code style & regex tweaks