little tidying in widget filling