Cleaned up EnTable code