smp : clean up smp code due to readability