(refactor) Use braces for one line blocks
(refactor) Deduplicate operatingsystem fact resolution