classes improvements