Cleans up some state code, makes joining lobbies easier