class view clean up