doing some simplification in class