minor improvement, added class category