remove all that 'class' crap in favor of instanceof