some minor 'cleanup' changes to dip