tidying up to work better with jube