Table coming together
Clean up