Cleaned up table slightly