cleaned some parts of the code : first 4 classes