Store data in a more precise way.
Make cleaning less error prone