Cleaned up SO var types