Renormalize database so its less bizarre