Jar add
Cleaning the code