user class tweak
cleaned up a bit