a bit of housekeeping. tidying up funtion calls...