switch from class var to class instance var
add short/long names