table cleaned up and ready v1