Re-factor of regular expression and code readability.
Re-factor of regular expression and code readability.

Minor improvements to the regular expression as well as code readability.

Signed-off-by: Krzysztof Wilczynski <9bf091559fc98493329f7d619638c79e91ccf029@linux.com>

benedikt-wegmann/facter-facts,kwilczynski/facter-facts