streamlined the class