Clean up the data hierarchy a little