some light refactoring; removing os_architecture since it's not in facter