better this/that class management