Making all classes better