Clean up data a bit