some clean up of interface