Cleaned up Tree typing