Cod cleaned. Classes added.