small changes to class handling

Signed-off-by: Stuart Long <srl51@case.edu>