feature codestyle and optimization step 1
feature codestyle and optimization step 2