Cleaning code and fixing title bug
Code cleaning
Improved code