Cleaned up transition table