cleaned up semantic classes