Remove unnecessary defaults and simplify regexp