Cleaned up table