[cyntain] Cleaned up some classes