removes osfamily dependency, cleanup of internal variable names