optimize some performance
make root folder clean