Clean up roommates table a bit