Map white space fixes
Optimize scope regex according to suggestions