Short namings
Union values can be arbitrary
Remove commented out code