Adds support for NUMA nodes instead of core offset
Some cleanup