Improve code
Rm useless files