code cleanup
 continue code clean up