optimize code

1. clean files
2. clean code