Remove dummy values and better precision