more class tidy