Remove unnecessary defaults, clean up word regexp