Made some cleaning and added some notes