tidying up dict calls