Some more reordering, introducing tags more explicitly