smp : clean up multi-core code due to readability