smp : clean up multi-core code due to readability

clean up multi-core code due to readability