Cleanup cpuid function.
Merge pull request #201 from florian-kriener/cpuid_cleanup

Cleanup cpuid function.