Cleaned up tables