feature codestyle and optimization step 1