tidying up builder