fix some bug&&update 'clean' method