misc class clean up