dps calculator interface cleanup