Remove unnecessary constant
Simpler name for variable
Remove some uncessary checks
Whitespace like in the other regexps