code styleup and remove old comments