[init] some minor changes, code cleaning