simplify core detection
Merge pull request #437 from chronomantic/os_detection_cleanup

simplify core detection