Minor reformats
Tweaked patterns to play nice with 10.8